Add another patch to fix test metadata

diff --git a/debian/changelog b/debian/changelog
index 53cbb87e64ee0f957efc0d233bd5b7ce06e1d350..f1e30b192d0c35ddb1e0622d9eb4e206ff683fba 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,8 +26,9 @@ gtk+4.0 (3.94.0-1) UNRELEASED; urgency=medium
     The build-time tests correctly set GTK_CSD=1 now.
   * Build installed-tests
     - Install them in gtk-4-examples for now to avoid the NEW queue
-    - d/p/reftests-Fix-path-to-installed-tests-in-.test-metadata.patch:
-      Add patch to fix .test metadata
+    - d/p/reftests-Fix-path-to-installed-tests-in-.test-metadata.patch,
+      d/p/testsuite-Make-installed-test-metadata-consistent-with-te.patch:
+      Add patches to fix .test metadata
   * Run installed-tests as autopkgtests (similar to #908440)
     - Mark them as flaky for now
   * Disable GStreamer video support for now

diff --git a/debian/patches/series b/debian/patches/series
index dc6971a8c2477a493889b7d7845aac6d39e9c647..a50e966461c2c5595ea7169a5ddbfb3bd911fe37 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 reftest-known-fail.patch
 reftests-Fix-path-to-installed-tests-in-.test-metadata.patch
 testsuite-Install-accessibility-dump-executable-alongside.patch
+testsuite-Make-installed-test-metadata-consistent-with-te.patch

diff --git a/debian/patches/testsuite-Make-installed-test-metadata-consistent-with-te.patch b/debian/patches/testsuite-Make-installed-test-metadata-consistent-with-te.patch
new file mode 100644 (file)
index 0000000..bb5c42f
--- /dev/null
+++ b/debian/patches/testsuite-Make-installed-test-metadata-consistent-with-te.patch
@@ -0,0 +1,25 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Wed, 19 Sep 2018 08:09:18 +0100
+Subject: testsuite: Make installed-test metadata consistent with test naming
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+---
+ testsuite/gtk/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build
+index d2febc4..ff0f85b 100644
+--- a/testsuite/gtk/meson.build
++++ b/testsuite/gtk/meson.build
+@@ -110,9 +110,9 @@ if add_languages('cpp')
+   if get_option('install-tests')
+     conf = configuration_data()
+     conf.set('testexecdir', testexecdir)
+-    conf.set('test', 'keywords')
++    conf.set('test', 'autotestkeywords')
+     configure_file(input: 'gtk.test.in',
+-                   output: 'keywords.test',
++                   output: 'autotestkeywords.test',
+                    configuration: conf,
+                    install_dir: testdatadir)
+   endif